Merge branch 'frame-popup' of https://github.com/bmag/emacs-which-key into pr12
authorjustbur <justin@burkett.cc>
Mon, 6 Jul 2015 18:23:56 +0000 (14:23 -0400)
committerjustbur <justin@burkett.cc>
Mon, 6 Jul 2015 18:23:56 +0000 (14:23 -0400)
1  2 
which-key.el

diff --cc which-key.el
Simple merge